(abbreviate-file-name): Match home dir with no / if nothing else follows.

diff --git a/lisp/files.el b/lisp/files.el
index 688b71b5bd4c02355b37d1ac1dacbe8244afcaf2..dc07a02473a2636deacc336b9ba304d5ee38f203 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -520,7 +520,9 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information."
     (or abbreviated-home-dir
        (setq abbreviated-home-dir
              (let ((abbreviated-home-dir "$foo"))
-               (concat "^" (abbreviate-file-name (expand-file-name "~/"))))))
+               (concat "^" (abbreviate-file-name (expand-file-name "~"))
+                       "\\(/\\|$\\)"))))
+                                                 
     ;; If FILENAME starts with the abbreviated homedir,
     ;; make it start with `~' instead.
     (if (string-match abbreviated-home-dir filename)
@@ -536,6 +538,7 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information."
                                       (1- (length abbreviated-home-dir))))
                          "/"
                        "")
+                     (substring filename (match-beginning 1) (match-end 1))
                      (substring filename (match-end 0)))))
     filename))